From 6ab594305b8ad1f24e59eafac1cb5442164f81ba Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 2 Sep 2014 09:01:17 -0700 Subject: [PATCH] Don't run doc tests for `cargo bench` They're not really related to benchmarks! Closes #486 --- src/cargo/ops/cargo_test.rs | 2 + tests/test_cargo_bench.rs | 95 +++---------------------------------- 2 files changed, 8 insertions(+), 89 deletions(-) diff --git a/src/cargo/ops/cargo_test.rs b/src/cargo/ops/cargo_test.rs index 7e8995769..cb8121668 100644 --- a/src/cargo/ops/cargo_test.rs +++ b/src/cargo/ops/cargo_test.rs @@ -40,6 +40,8 @@ pub fn run_tests(manifest_path: &Path, } } + if options.compile_opts.env == "bench" { return Ok(None) } + let mut libs = package.get_targets().iter().filter_map(|target| { if !target.get_profile().is_doctest() || !target.is_lib() { return None diff --git a/tests/test_cargo_bench.rs b/tests/test_cargo_bench.rs index acbd23ab9..26dfe4d90 100644 --- a/tests/test_cargo_bench.rs +++ b/tests/test_cargo_bench.rs @@ -2,7 +2,7 @@ use std::path; use std::str; use support::{project, execs, basic_bin_manifest, basic_lib_manifest}; -use support::{COMPILING, cargo_dir, ResultTest, FRESH, RUNNING, DOCTEST}; +use support::{COMPILING, cargo_dir, ResultTest, FRESH, RUNNING}; use support::paths::PathExt; use hamcrest::{assert_that, existing_file}; use cargo::util::process; @@ -199,15 +199,8 @@ test lib_bench ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo - -running 1 test -test foo_0 ... ignored - -test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured - ", - COMPILING, p.url(), running = RUNNING, doctest = DOCTEST))) + COMPILING, p.url(), running = RUNNING))) }) test!(bench_with_deep_lib_dep { @@ -258,15 +251,8 @@ test bar_bench ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} bar - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", compiling = COMPILING, running = RUNNING, - doctest = DOCTEST, dir = p.url()).as_slice())); }) @@ -314,14 +300,8 @@ test internal_bench ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", - COMPILING, p.url(), running = RUNNING, doctest = DOCTEST))) + COMPILING, p.url(), running = RUNNING))) }) test!(external_bench_implicit { @@ -365,14 +345,8 @@ test internal_bench ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", - COMPILING, p.url(), running = RUNNING, doctest = DOCTEST))) + COMPILING, p.url(), running = RUNNING))) }) test!(dont_run_examples { @@ -418,15 +392,8 @@ test bar ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", compiling = COMPILING, running = RUNNING, - doctest = DOCTEST, dir = p.url()).as_slice())); assert_that(p.cargo_process("bench").arg("foo"), @@ -440,15 +407,8 @@ test foo ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", compiling = COMPILING, running = RUNNING, - doctest = DOCTEST, dir = p.url()).as_slice())); }) @@ -516,14 +476,8 @@ test [..] ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", - COMPILING, p.url(), running = RUNNING, doctest = DOCTEST))) + COMPILING, p.url(), running = RUNNING))) }) test!(lib_with_standard_name { @@ -571,16 +525,9 @@ test foo_bench ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} syntax - -running 1 test -test foo_0 ... ignored - -test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured - ", compiling = COMPILING, running = RUNNING, - doctest = DOCTEST, dir = p.url()).as_slice())); + dir = p.url()).as_slice())); }) test!(lib_with_standard_name2 { @@ -727,16 +674,8 @@ test foo ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo -{running} [..] - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", compiling = COMPILING, running = RUNNING, - doctest = DOCTEST, dir = p.url()).as_slice())); p.root().move_into_the_past().assert(); assert_that(p.process(cargo_dir().join("cargo")).arg("bench").arg("-v"), @@ -762,16 +701,8 @@ test foo ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo -{running} [..] - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", fresh = FRESH, running = RUNNING, - doctest = DOCTEST, dir = p.url()).as_slice())); }) @@ -801,15 +732,8 @@ test foo ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", compiling = COMPILING, running = RUNNING, - doctest = DOCTEST, dir = p.url()).as_slice())); assert_that(p.process(cargo_dir().join("cargo")).arg("bench"), @@ -823,14 +747,7 @@ test foo ... bench: 0 ns/iter (+/- 0) test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured -{doctest} foo - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured - ", fresh = FRESH, running = RUNNING, - doctest = DOCTEST, dir = p.url()).as_slice())); }) -- 2.30.2